From 2833c7ee94eb8a962939af4c0f9f0862408d77f3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 28 Dec 2004 07:39:31 +0000 Subject: [PATCH] Inherit submenu direction from the parent menu. 2004-12-28 Matthias Clasen * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit submenu direction from the parent menu. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkmenuitem.c | 4 +--- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 262f321d86..7b3e87ff45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-12-28 Matthias Clasen + * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit + submenu direction from the parent menu. + * gtk/gtkmenushell.c (gtk_menu_shell_select_submenu_first): Return a boolean indicating whether an item in the submenu was selected. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 262f321d86..7b3e87ff45 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-12-28 Matthias Clasen + * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit + submenu direction from the parent menu. + * gtk/gtkmenushell.c (gtk_menu_shell_select_submenu_first): Return a boolean indicating whether an item in the submenu was selected. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 262f321d86..7b3e87ff45 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-12-28 Matthias Clasen + * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit + submenu direction from the parent menu. + * gtk/gtkmenushell.c (gtk_menu_shell_select_submenu_first): Return a boolean indicating whether an item in the submenu was selected. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 262f321d86..7b3e87ff45 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-12-28 Matthias Clasen + * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit + submenu direction from the parent menu. + * gtk/gtkmenushell.c (gtk_menu_shell_select_submenu_first): Return a boolean indicating whether an item in the submenu was selected. diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index fd1ad7ccdc..c0b966fa6d 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -1105,9 +1105,7 @@ gtk_menu_item_position_menu (GtkMenu *menu, case GTK_LEFT_RIGHT: parent_menu_item = GTK_MENU (widget->parent)->parent_menu_item; parent_xthickness = widget->parent->style->xthickness; - if (parent_menu_item && - !GTK_MENU (widget->parent)->torn_off && - !GTK_MENU_SHELL (menu)->active) + if (parent_menu_item && !GTK_MENU (widget->parent)->torn_off) menu_item->submenu_direction = GTK_MENU_ITEM (parent_menu_item)->submenu_direction; else if (direction == GTK_TEXT_DIR_LTR) menu_item->submenu_direction = GTK_DIRECTION_RIGHT; -- 2.30.2